Nov. branch merge. Various features backported from stable, various bug fixes.